Adjusted data source name constants, added them to appropriate classes.