Fixed naming issue with codes