Define name changes and general cleanup