runtime: Name things more consistently