An end-wall unit for a submersible motor unit and a submersible motor unit for use in driving a pump including a housing that extends along a longitudinal axis and defines an interior chamber, a stator at least partially enclosed by said housing within a stator chamber, a rotor rotatably supported by a bearing assembly and at least partially enclosed by said stator, and an end-wall assembly that includes an end cap and at least one of a capacitor and a bearing assembly. The at least one of the capacitor and the bearing assembly is supported by the end cap in a position such that the at least one of the capacitor and the bearing assembly is at least partially enclosed by the housing when the end-wall assembly is installed on the motor unit.