Changing to C-style names