New core plugin fixes. Renamed, fixed, renewed