modified property names to use rails standard