Readded project frame - Some renaming