FLOE-115: Naming improvement and a comment for a future todo.