ticket:53 fixing field naming