Fixing names to be in line with the conventions.