Some lexical fixes and renaming class properties.