rename project and some naming fixes