- Fix contract naming issue