naming fix and update to 1.5