Fixed string format construction and changed case of push field names