code cleanup for name change