Fix naming, fix format