all occurrences of 'rimpl' changed to 'cimpl' (and 'nrimpl' -> 'ncimpl')