Small naming corrections and errors fixed