Make naming of proc consistent