Moved entry_name into helper.
Added specs for entry_name helper.