Use "pop" and "pops" instead of "pop3" and "pop3s"

Fixes issue #14