Another naming issue fixed