Fix small gates by following naming convention