Moving to more descriptive names for demo