Rename classes to use username-prefix