Added a demo file and refactored some names