Old naming convention fixed