Fixed names and layers
Abstracted method, fixed handler to log names