more fixes ... rename