renamed controllers and other objects
Merge pull request #3 from jennywen/juliet

renamed controllers and other objects