+1 for renaming

My only concern is if there are routines that assume that filled entries are non-zero and fail catastrophically due to divide-by-zero in a linear solve or something like that.