Slight plugin rename, bug fix