Renaming class so that it is JSR310-specifically named.