ref #3658 remove nomenclatural code from datasources