Eliminating some `using namespace`

[#80021262]
Removing unnecessary `dev` name prefixes

[#80021262]
Some changes about final/stop block