Cleanup and name prefixing.