cleaned up the naming