Fixed naming issues