Rename components and use om-tools constructor helpers