Removed suffix -es from some attributes