Layer terminology fix 2