Clean up and name prefixing