refactored naming to camel case: e.g. TID -> TId