Changes to adapt rails 4 and amahi naming convention