fixing order and enhacing naming

Signed-off-by: root <root@maca25400702875.example.com>