Commit
Fixes some small problems with naming.