Name functions along corresponding UCI commands

No functional change.
Merge remote-tracking branch 'refs/remotes/MainFish/master'