More type safety in node names