Cleanup and name changes