changed SourceProvider data files name
minor variables naming changes