Made pointer naming more consistent