Removed self-prefix on various components.