Fixing SLS some more
More naming synching