Database element names corrected