Some renames, formats etc

Fixed commends from review