Rename factory class