renames
Some fixes