Removed assumptions on implementation names.