fix state rename, fix import states