MarkerLayer: Update method names; cleanup