Fixed naming of things unused code