update main and controller names

also update for gruntfile