Fixing names
new names