docker: rename internal functions pass2