renamed a few constants to more generic names (instead of demoXXX)