Rename oo- prefix to class-
Rename aliases to start with @