Update Help code to support new naming convention