Cleaned up the naming