Resync with latest names

Signed-off-by: robertsonics <jamie@robertsonics.com>