Fix name consistency