altered field naming convention slightly