Now respecting naming conventions + some README errors corrected