WIP: rename the registration method class names to the new template names