[FIX] prevent to add field if present and rename module