Organization

Just changing the names to make them more readable