Cleaned up some property names