Modified Bilder names to include the class name. Data provider changed
accordingly.