Fixed naming issue