Names fixing

Some names fixing