#28 -  minor naming fixes