Fixed naming issues in code