Refactor to get the interface implementation of input creation, and
renaming.