Merged applayer and adapted physemulator to use the same names as actual layer