Conform to stupid syntax, changed a few names