Uses OC.basename instead of custom code