Final rename to shorter more usefull project names. Part of the cleanup and tidying of samples.