Some renamings and extra functions