Fixed demo application after the naming convention change