Renamed main gun method

Minor proxy/handler changes