Tidy up function names

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
More work in progress...

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
More WIP

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>