Improved handling of Bible names