Fixing install scripts following rename and cleanup