some renaming
Merge branch 'APX_devel' of https://github.com/mvdm/vandermeerlab into APX_devel