Fixed naming and removed single quotes