Fixed naming, and code style