More cleanups from namechange