servicelib files were renamed again