better naming
do other naming fixes