Lawrence D'Oliveiro get rid of CamelCase