@galderz If we do this here, we should also update the current codebase to follow the said convention?