Changing to C-style names - continued