Rename to camelcase and create datasource class