Cleanup to match terminology
Updated datasource to match controller changes