Updated names
Merge branch 'Rick'