Cleaned up the naming a bit