layer: Improve API consistency
14 files changed