Renamings in CDI module