Fix: separate peer frame from self frame, DSL these terms to simply self and peer