Some renaming in the included code