Updated naming conventions to reflect WP core