Name functions along corresponding UCI commands

No functional change.