Add back the schemeless logic; ensure var names are camel case for consistency
fix tests