Updated demo and tests to use new names