Minor changes and some renamings