+1 to keeping the current names - as long as we as developers understand this code, then we are ok.