Made naming scheme more professional, edited db lookup