Fixing issues with controller names. Resolving issues seen on Ubuntu 13.10