layer: Fix API naming to follow convention
6 files changed