bugfix in inclusion code + renames