Add prototype names rule, small fix ups