Changed some namings
Changed some namings
Merge branch 'master' of https://github.com/gt-big-data/hack-night-1-ui