fix ui test and same renamings