Prefix some classes. Consistent naming of parameters. Removed macros.