- [study] some naming fixes;