Make naming scheme for registry classes more generic