Corrected few naming coventions