[1894] Avoid doing costly name splits (database backend)
[1894] Minor coding style fix