Minor naming fixes
Merge branch 'master' of github.com:octobercms/library