Renaming SQLwrapper to CriteriaStatement