Changes with Mabelle

Changed a couple of broken coding conventions.