moved name store to store_id in all forms