issue #5, replace the words used in demo with more appropriate ones