Rename and replace samples
Fix return values
Fix targets name