fixed key naming convention to fit more Ruby style