Merge pull request #652 from MrPetovan/task/5410-rename-dba-to-DBA