Changed property names for consistency (migration included)