Renamed controllers to match naming convention.
Fixed line break bug in success message.
Merge branch 'issue-14' into develop