Opted for consistency over renaming fields