Change all static references to protocol neutral