expand range of valid propositition names and change double-quote escape character to single quote to avoid escaping in java