Naming translation table, re-arranged methods, updated conf file(s)

Courtesy of Jamie